Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 19 Dec 2011 21:14:19 +0000 (13:14 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 19 Dec 2011 21:14:19 +0000 (13:14 -0800)
commitf974f0ed6d9829143a7294193e16d0fc23b70b7d
tree77ecb54d34405c4524ab79155dca8e7b222f297b
parentdbcb39c3fb159704f3a2e43f4128f1130934ea89
parent8bcdccd2294741351bf67ff22f852fb3dad902c4
Merge from trunk.